From: Joakim Verona <joakim@verona.se>
Date: Wed, 21 Aug 2013 19:56:47 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3b6a2946d0e4014bffa1bb0ceb14727592e2c4d4;p=emacs.git

merge from trunk
---

3b6a2946d0e4014bffa1bb0ceb14727592e2c4d4